APP-402: Resolved merge conflict
APP-402: Resolved merge conflict
kaaproject/sample-apps,kaaproject/sample-apps,kaaproject/sample-apps,kaaproject/sample-apps,kaaproject/sample-apps,kaaproject/sample-apps,kaaproject/sample-apps,kaaproject/sample-apps