Merge "Added setAlwaysOn feature"